Merge pull request #1657 from OutpostUniverse/GameOptionsDialog-Signal-Handler-Rename

Game options dialog signal handler rename

Author: DanRStevens

appOPHD/States/MapViewState.h

@@ -269,8 +269,8 @@ class MapViewState : public Wrapper
 
 	void onNotificationClicked(const NotificationArea::Notification&);
 
-	void onSaveGame();
-	void onLoadGame();
+	void onOpenSaveGameDialog();
+	void onOpenLoadGameDialog();
 	void onReturnToGame();
 	void onGameOver();
 

appOPHD/States/MapViewStateUi.cpp

@@ -87,10 +87,10 @@ void MapViewState::initUi()
 	mGameOverDialog.returnToMainMenu().connect({this, &MapViewState::onGameOver});
 	mGameOverDialog.hide();
 
-	mGameOptionsDialog.SaveGame().connect({this, &MapViewState::onSaveGame});
-	mGameOptionsDialog.LoadGame().connect({this, &MapViewState::onLoadGame});
-	mGameOptionsDialog.returnToGame().connect({this, &MapViewState::onReturnToGame});
-	mGameOptionsDialog.returnToMainMenu().connect({this, &MapViewState::onGameOver});
+	mGameOptionsDialog.saveGameDialogButtonSignal().connect({this, &MapViewState::onOpenSaveGameDialog});
+	mGameOptionsDialog.loadGameDialogButtonSignal().connect({this, &MapViewState::onOpenLoadGameDialog});
+	mGameOptionsDialog.returnToGameButtonSignal().connect({this, &MapViewState::onReturnToGame});
+	mGameOptionsDialog.returnToMainMenuButtonSignal().connect({this, &MapViewState::onGameOver});
 	mGameOptionsDialog.hide();
 
 	mAnnouncement.hide();
@@ -610,7 +610,7 @@ void MapViewState::onDiggerSelectionDialog(Direction direction, Tile& tile)
 /**
  * Click handler for the main menu Save Game button.
  */
-void MapViewState::onSaveGame()
+void MapViewState::onOpenSaveGameDialog()
 {
 	mGameOptionsDialog.hide();
 	mFileIoDialog.showSave(constants::SaveGamePath);
@@ -620,7 +620,7 @@ void MapViewState::onSaveGame()
 /**
  * Click handler for the main menu Load Game button.
  */
-void MapViewState::onLoadGame()
+void MapViewState::onOpenLoadGameDialog()
 {
 	mGameOptionsDialog.hide();
 	mFileIoDialog.showOpen(constants::SaveGamePath);

appOPHD/UI/GameOptionsDialog.cpp

@@ -49,12 +49,12 @@ void GameOptionsDialog::update()
 
 void GameOptionsDialog::onSave()
 {
-	mSignalSave();
+	mSignalSaveDialog();
 }
 
 void GameOptionsDialog::onLoad()
 {
-	mSignalLoad();
+	mSignalLoadDialog();
 }
 
 void GameOptionsDialog::onHelp()

appOPHD/UI/GameOptionsDialog.h

@@ -13,10 +13,10 @@ class GameOptionsDialog : public Window
 
 	void update() override;
 
-	ClickSignal::Source& SaveGame() { return mSignalSave; }
-	ClickSignal::Source& LoadGame() { return mSignalLoad; }
-	ClickSignal::Source& returnToGame() { return mSignalReturn; }
-	ClickSignal::Source& returnToMainMenu() { return mSignalClose; }
+	ClickSignal::Source& saveGameDialogButtonSignal() { return mSignalSaveDialog; }
+	ClickSignal::Source& loadGameDialogButtonSignal() { return mSignalLoadDialog; }
+	ClickSignal::Source& returnToGameButtonSignal() { return mSignalReturn; }
+	ClickSignal::Source& returnToMainMenuButtonSignal() { return mSignalClose; }
 
 private:
 	const int buttonHeight = 25;
@@ -38,8 +38,8 @@ class GameOptionsDialog : public Window
 	Button btnReturn;
 	Button btnClose;
 
-	ClickSignal mSignalSave;
-	ClickSignal mSignalLoad;
+	ClickSignal mSignalSaveDialog;
+	ClickSignal mSignalLoadDialog;
 	ClickSignal mSignalReturn;
 	ClickSignal mSignalClose;
 };