Merge pull request #75 from Databean/minor_controller_refactor

Changed the name of a couple button handlers to be more descriptive

Author: Databean

include/GameController.h

@@ -34,7 +34,7 @@ class GameController {
 	GameController(GameBoard&, GameView& view);
 	~GameController();
 
-	bool nextTurn(ScreenCoordinate);
+	bool handleNextTurnButtonEvent(ScreenCoordinate);
 	bool handleBoardEvent(ScreenCoordinate);
 	bool handleRoadButtonEvent(ScreenCoordinate);
 	bool handleSettlementButtonEvent(ScreenCoordinate);
@@ -59,7 +59,7 @@ class GameController {
 	bool handleConfirmRoadCard(ScreenCoordinate);
 	bool handleCancelDialogueEvent(ScreenCoordinate);
 
-    bool viewCardTotals(ScreenCoordinate coord);
+    bool handleViewCardTotalsButtonEvent(ScreenCoordinate coord);
 
 	void pushState(ControlState);
 	ControlState getState();

src/GameController.cpp

@@ -41,7 +41,7 @@ GameController::GameController(GameBoard& model, GameView& view) : model(model),
 		font, fontSize, getGraphicsConfig()["screen.wonderButton.text"]));
 
 	view.addElement(makeViewButtonText(
-		std::bind(&GameController::nextTurn, this, _1), 
+		std::bind(&GameController::handleNextTurnButtonEvent, this, _1),
 		getGraphicsConfig()["screen.endTurnButton.area"],							
 		font, fontSize, "End Turn"));
 
@@ -112,7 +112,7 @@ GameController::GameController(GameBoard& model, GameView& view) : model(model),
 		font, fontSize, getGraphicsConfig()["screen.wheatButton.text"]));
 
 	view.addElement(makeViewButtonText(
-		std::bind(&GameController::viewCardTotals, this, _1), 
+		std::bind(&GameController::handleViewCardTotalsButtonEvent, this, _1),
 		getGraphicsConfig()["screen.showTotalButton.area"],
 		font, fontSize, getGraphicsConfig()["screen.showTotalButton.text"]));
 
@@ -207,7 +207,7 @@ int GameController::getClickHistorySize(){
 /**
  *  calls a function to advance turn, hide resource and development cards, check for victory, and roll dice
  */
-bool GameController::nextTurn(ScreenCoordinate) {
+bool GameController::handleNextTurnButtonEvent(ScreenCoordinate) {
 	if(getState() != BASESTATE){
 		return false;
 	}
@@ -492,7 +492,7 @@ bool GameController::handleVictoryPointCardButtonEvent(ScreenCoordinate coord){
 /**
  * Makes the development and resource card totals visible
  */
-bool GameController::viewCardTotals(ScreenCoordinate coord)
+bool GameController::handleViewCardTotalsButtonEvent(ScreenCoordinate coord)
 {
     auto font = getGraphicsConfig()["font.path"];
 	auto fontSize = getGraphicsConfig()["font.size"];