LAB: Some renames

7 files changed, 25 insertions, 25 deletions

diff --git a/engines/lab/engine.cpp b/engines/lab/engine.cpp
index 83beb03760..f43f1fa448 100644
--- a/engines/lab/engine.cpp
+++ b/engines/lab/engine.cpp
@@ -164,7 +164,7 @@ void LabEngine::freeScreens() {
 void LabEngine::perFlipButton(uint16 buttonId) {
 	for (ButtonList::iterator button = _moveButtonList.begin(); button != _moveButtonList.end(); ++button) {
 		Button *topButton = *button;
-		if (topButton->_buttonID == buttonId) {
+		if (topButton->_buttonId == buttonId) {
 			Image *tmpImage = topButton->_image;
 			topButton->_image = topButton->_altImage;
 			topButton->_altImage = tmpImage;
@@ -576,7 +576,7 @@ void LabEngine::mainGameLoop() {
 			curPos.y  = curMsg->_mouseY;
 
 			_followingCrumbs = false;
-			if (!fromCrumbs(curMsg->_msgClass, curMsg->_code, curMsg->_qualifier, curPos, curInv, curMsg, forceDraw, curMsg->_buttonID, actionMode))
+			if (!fromCrumbs(curMsg->_msgClass, curMsg->_code, curMsg->_qualifier, curPos, curInv, curMsg, forceDraw, curMsg->_buttonId, actionMode))
 				break;
 		}
 	}
diff --git a/engines/lab/eventman.cpp b/engines/lab/eventman.cpp
index ba473fc67f..001e4295d9 100644
--- a/engines/lab/eventman.cpp
+++ b/engines/lab/eventman.cpp
@@ -101,7 +101,7 @@ void EventManager::attachButtonList(ButtonList *buttonList) {
 Button *EventManager::getButton(uint16 id) {
 	for (ButtonList::iterator buttonItr = _screenButtonList->begin(); buttonItr != _screenButtonList->end(); ++buttonItr) {
 		Button *button = *buttonItr;
-		if (button->_buttonID == id)
+		if (button->_buttonId == id)
 			return button;
 	}
 
diff --git a/engines/lab/eventman.h b/engines/lab/eventman.h
index acfccb21de..68b441a1f2 100644
--- a/engines/lab/eventman.h
+++ b/engines/lab/eventman.h
@@ -55,13 +55,13 @@ class Image;
 
 struct IntuiMessage {
 	uint32 _msgClass;
-	uint16 _code, _qualifier, _mouseX, _mouseY, _buttonID;
+	uint16 _code, _qualifier, _mouseX, _mouseY, _buttonId;
 	uint32 _seconds, _micros;
 };
 
 
 struct Button {
-	uint16 _x, _y, _buttonID;
+	uint16 _x, _y, _buttonId;
 	uint16 _keyEquiv; // if not zero, a key that activates button
 	bool _isEnabled;
 	Image *_image, *_altImage;
diff --git a/engines/lab/interface.cpp b/engines/lab/interface.cpp
index c52933d230..fea9f5a764 100644
--- a/engines/lab/interface.cpp
+++ b/engines/lab/interface.cpp
@@ -45,7 +45,7 @@ Button *EventManager::createButton(uint16 x, uint16 y, uint16 id, uint16 key, Im
 	if (button) {
 		button->_x = _vm->_utils->vgaScaleX(x);
 		button->_y = y;
-		button->_buttonID = id;
+		button->_buttonId = id;
 		button->_keyEquiv = key;
 		button->_image = image;
 		button->_altImage = altImage;
@@ -117,7 +117,7 @@ Button *EventManager::checkNumButtonHit(ButtonList *buttonList, uint16 key) {
 
 	for (ButtonList::iterator buttonItr = buttonList->begin(); buttonItr != buttonList->end(); ++buttonItr) {
 		Button *button = *buttonItr;
-		if (((gkey - 1 == button->_buttonID) || ((gkey == 0) && (button->_buttonID == 9))
+		if (((gkey - 1 == button->_buttonId) || ((gkey == 0) && (button->_buttonId == 9))
 		 || ((button->_keyEquiv != 0) && (makeButtonKeyEquiv(key) == button->_keyEquiv)))
 			  && button->_isEnabled) {
 			mouseHide();
@@ -141,13 +141,13 @@ IntuiMessage *EventManager::getMsg() {
 	updateMouse();
 
 	int qualifiers = _keyPressed.flags;
-	Button *curgad  = mouseButton();
+	Button *curButton  = mouseButton();
 
-	if (curgad) {
+	if (curButton) {
 		updateMouse();
 		message._msgClass = BUTTONUP;
-		message._code  = curgad->_buttonID;
-		message._buttonID = curgad->_buttonID;
+		message._code = curButton->_buttonId;
+		message._buttonId = curButton->_buttonId;
 		message._qualifier = qualifiers;
 		return &message;
 	} else if (mouseButton(&message._mouseX, &message._mouseY, true)) {
@@ -162,12 +162,12 @@ IntuiMessage *EventManager::getMsg() {
 		return &message;
 	} else if (keyPress(&message._code)) {
 		// Keyboard key
-		curgad = checkNumButtonHit(_screenButtonList, message._code);
+		curButton = checkNumButtonHit(_screenButtonList, message._code);
 
-		if (curgad) {
+		if (curButton) {
 			message._msgClass = BUTTONUP;
-			message._code  = curgad->_buttonID;
-			message._buttonID = curgad->_buttonID;
+			message._code = curButton->_buttonId;
+			message._buttonId = curButton->_buttonId;
 		} else
 			message._msgClass = RAWKEY;
 
diff --git a/engines/lab/lab.h b/engines/lab/lab.h
index d888fbb3a9..4cd681e635 100644
--- a/engines/lab/lab.h
+++ b/engines/lab/lab.h
@@ -241,7 +241,7 @@ private:
 	void showLab2Teaser();
 	void mayShowCrumbIndicator();
 	void mayShowCrumbIndicatorOff();
-	void perFlipButton(uint16 gadID);
+	void perFlipButton(uint16 buttonId);
 	uint16 processArrow(uint16 curDirection, uint16 arrow);
 	void processJournal();
 	void processMap(uint16 curRoom);
diff --git a/engines/lab/map.cpp b/engines/lab/map.cpp
index 1222e1ad8c..09d89883e1 100644
--- a/engines/lab/map.cpp
+++ b/engines/lab/map.cpp
@@ -472,7 +472,7 @@ void LabEngine::processMap(uint16 curRoom) {
 		} else {
 			uint32 msgClass  = msg->_msgClass;
 			uint16 msgCode   = msg->_code;
-			uint16 buttonID  = msg->_buttonID;
+			uint16 buttonId  = msg->_buttonId;
 			uint16 qualifier = msg->_qualifier;
 			uint16 mouseX    = msg->_mouseX;
 			uint16 mouseY    = msg->_mouseY;
@@ -481,10 +481,10 @@ void LabEngine::processMap(uint16 curRoom) {
 				return;
 
 			if (msgClass == BUTTONUP) {
-				if (buttonID == 0) {
+				if (buttonId == 0) {
 					// Quit menu button
 					return;
-				} else if (buttonID == 1) {
+				} else if (buttonId == 1) {
 					// Up arrow
 					uint16 upperFloor = getUpperFloor(curFloor);
 					if (upperFloor != kFloorNone) {
@@ -493,7 +493,7 @@ void LabEngine::processMap(uint16 curRoom) {
 						drawMap(curRoom, curMsg, curFloor, false, false);
 						_graphics->fade(true, 0);
 					}
-				} else if (buttonID == 2) {
+				} else if (buttonId == 2) {
 					// Down arrow
 					uint16 lowerFloor = getLowerFloor(curFloor);
 					if (lowerFloor != kFloorNone) {
diff --git a/engines/lab/special.cpp b/engines/lab/special.cpp
index 1008314d4c..d61ddcb26e 100644
--- a/engines/lab/special.cpp
+++ b/engines/lab/special.cpp
@@ -270,20 +270,20 @@ void LabEngine::processJournal() {
 		else {
 			uint32 msgClass  = msg->_msgClass;
 			uint16 qualifier = msg->_qualifier;
-			uint16 gadID     = msg->_code;
+			uint16 buttonId  = msg->_code;
 
 			if (((msgClass == MOUSEBUTTONS) && (IEQUALIFIER_RIGHTBUTTON & qualifier)) ||
-				  ((msgClass == RAWKEY) && (gadID == 27)))
+				  ((msgClass == RAWKEY) && (buttonId == 27)))
 				return;
 			else if (msgClass == BUTTONUP) {
-				if (gadID == 0) {
+				if (buttonId == 0) {
 					if (_journalPage >= 2) {
 						_journalPage -= 2;
 						drawJournal(1, false);
 					}
-				} else if (gadID == 1) {
+				} else if (buttonId == 1) {
 					return;
-				} else if (gadID == 2) {
+				} else if (buttonId == 2) {
 					if (!_lastPage) {
 						_journalPage += 2;
 						drawJournal(2, false);