JANITORIAL: Simply use *x instead of *x.get() on smart pointers.

4 files changed, 11 insertions, 11 deletions

diff --git a/engines/kyra/gui_eob.cpp b/engines/kyra/gui_eob.cpp
index 76e4f0dba9..e3c0743e5c 100644
--- a/engines/kyra/gui_eob.cpp
+++ b/engines/kyra/gui_eob.cpp
@@ -1460,7 +1460,7 @@ void GUI_EoB::processButton(Button *button) {
 				// nullsub (at least EOBII)
 			} else if (button->data0Val1 == 4) {
 				if (button->data1Callback)
-					(*button->data1Callback.get())(button);
+					(*button->data1Callback)(button);
 			}
 		} else if (button->data1Val1 == 2) {
 			if (!(button->flags2 & 4))
@@ -1469,7 +1469,7 @@ void GUI_EoB::processButton(Button *button) {
 			// nullsub (at least EOBII)
 		} else if (button->data1Val1 == 4) {
 			if (button->data1Callback)
-				(*button->data1Callback.get())(button);
+				(*button->data1Callback)(button);
 		}
 	}
 
@@ -1486,7 +1486,7 @@ void GUI_EoB::processButton(Button *button) {
 				// nullsub (at least EOBII)
 			} else if (button->data0Val1 == 4) {
 				if (button->data2Callback)
-					(*button->data2Callback.get())(button);
+					(*button->data2Callback)(button);
 			}
 		} else if (button->data2Val1 == 2) {
 			_screen->drawBox(sx, sy, fx2, fy2, (button->flags2 & 1) ? button->data3Val2 : button->data2Val2);
@@ -1494,7 +1494,7 @@ void GUI_EoB::processButton(Button *button) {
 			// nullsub (at least EOBII)
 		} else if (button->data2Val1 == 4) {
 			if (button->data2Callback)
-				(*button->data2Callback.get())(button);
+				(*button->data2Callback)(button);
 		}
 	}
 
@@ -1507,7 +1507,7 @@ void GUI_EoB::processButton(Button *button) {
 			// nullsub (at least EOBII)
 		} else if (button->data0Val1 == 4) {
 			if (button->data0Callback)
-				(*button->data0Callback.get())(button);
+				(*button->data0Callback)(button);
 		} else if (button->data0Val1 == 5) {
 			_screen->drawBox(sx, sy, fx2, fy2, button->data0Val2);
 		} else {
@@ -1876,7 +1876,7 @@ int GUI_EoB::processButtonList(Kyra::Button *buttonList, uint16 inputFlags, int8
 			processButton(buttonList);
 
 		if (v6 && buttonList->buttonCallback)
-			runLoop = !(*buttonList->buttonCallback.get())(buttonList);
+			runLoop = !(*buttonList->buttonCallback)(buttonList);
 
 		if ((flgs2 & 2) && (flgs & 0x20))
 			runLoop = false;
diff --git a/engines/kyra/gui_lok.cpp b/engines/kyra/gui_lok.cpp
index 18470e5d76..b4e5148b64 100644
--- a/engines/kyra/gui_lok.cpp
+++ b/engines/kyra/gui_lok.cpp
@@ -243,7 +243,7 @@ int GUI_LoK::processButtonList(Button *list, uint16 inputFlag, int8 mouseWheel)
 		}
 
 		if (mouseWheel && list->mouseWheel == mouseWheel && list->buttonCallback) {
-			if ((*list->buttonCallback.get())(list))
+			if ((*list->buttonCallback)(list))
 				break;
 		}
 
@@ -282,7 +282,7 @@ int GUI_LoK::processButtonList(Button *list, uint16 inputFlag, int8 mouseWheel)
 
 			if (processMouseClick) {
 				if (list->buttonCallback) {
-					if ((*list->buttonCallback.get())(list))
+					if ((*list->buttonCallback)(list))
 						break;
 				}
 			}
@@ -349,7 +349,7 @@ void GUI_LoK::processButton(Button *button) {
 	if (processType == 1 && shape)
 		_screen->drawShape(_screen->_curPage, shape, x, y, button->dimTableIndex, 0x10);
 	else if (processType == 4 && callback)
-		(*callback.get())(button);
+		(*callback)(button);
 }
 
 void GUI_LoK::setGUILabels() {
diff --git a/engines/kyra/gui_lol.cpp b/engines/kyra/gui_lol.cpp
index b025aefbd0..a79da0681e 100644
--- a/engines/kyra/gui_lol.cpp
+++ b/engines/kyra/gui_lol.cpp
@@ -2165,7 +2165,7 @@ int GUI_LoL::processButtonList(Button *buttonList, uint16 inputFlag, int8 mouseW
 
 			if (buttonList->buttonCallback) {
 				//_vm->removeInputTop();
-				if ((*buttonList->buttonCallback.get())(buttonList))
+				if ((*buttonList->buttonCallback)(buttonList))
 					break;
 			}
 
diff --git a/engines/kyra/gui_v2.cpp b/engines/kyra/gui_v2.cpp
index 580adb0e5d..65f8bd45e5 100644
--- a/engines/kyra/gui_v2.cpp
+++ b/engines/kyra/gui_v2.cpp
@@ -360,7 +360,7 @@ int GUI_v2::processButtonList(Button *buttonList, uint16 inputFlag, int8 mouseWh
 
 			if (buttonList->buttonCallback) {
 				_vm->removeInputTop();
-				if ((*buttonList->buttonCallback.get())(buttonList))
+				if ((*buttonList->buttonCallback)(buttonList))
 					break;
 			}