Switching from fstream pointers to references.

Author: PickledMonkey

include/GameBoard.h

@@ -18,8 +18,8 @@ class GameBoard {
 	std::map<Coordinate, std::unique_ptr<GamePiece>> pieces;
 	std::vector<std::unique_ptr<const Road>> roads;
 
-	int constructBoardFromFile(std::ifstream * file);
-	int constructFileFromBoard(std::ofstream * file);
+	int constructBoardFromFile(std::ifstream &file);
+	int constructFileFromBoard(std::ofstream &file);
 
 public:
 	GameBoard();

src/GameBoard.cpp

@@ -10,56 +10,52 @@ GameBoard::~GameBoard() {
 
 
 int GameBoard::save_Board(std::string filename){
-	std::ofstream * file = new std::ofstream;
-	file->exceptions(std::ofstream::failbit | std::ofstream::badbit);
+	std::ofstream file;
+	file.exceptions(std::ofstream::failbit | std::ofstream::badbit);
 	try {
 		filename = filename + ".wocs";
-		file->open(filename.c_str());
+		file.open(filename.c_str());
 		constructFileFromBoard(file);
-		file->close();
-		delete(file);
+		file.close();
 		return 0;
 	} catch (std::ofstream::failure e) {
 		std::cerr << "Exception opening/closing/writing file: " << e.what();
-		delete (file);
 	}
 	return -1;
 
 }
 
 int GameBoard::load_Board(std::string filename){
-	std::ifstream * file = new std::ifstream;
+	std::ifstream file;
 	try {
 		filename = filename + ".wocs";
-		file->open(filename.c_str());
+		file.open(filename.c_str());
 		constructBoardFromFile(file);
-		file->close();
-		delete(file);
+		file.close();
 		return 0;
 	} catch (std::ifstream::failure e) {
 		std::cerr << "Exception opening/closing/reading file: " << e.what();
-		delete (file);
 	}
 	return -1;
 }
 
-int GameBoard::constructBoardFromFile(std::ifstream * file){
+int GameBoard::constructBoardFromFile(std::ifstream &file){
 	//Parse and construct the board from the file
 	//@ TODO
 	std::string line;
-	if (file->is_open()) {
-		while (getline(*file, line)) {
+	if (file.is_open()) {
+		while (getline(file, line)) {
 			std::cout << line << '\n';
 		}
 	}
 	return 0;
 }
 
 
-int GameBoard::constructFileFromBoard(std::ofstream * file){
+int GameBoard::constructFileFromBoard(std::ofstream &file){
 	//Construct the file based on the structure of the board
 	//@ TODO
-	*file << "Hello World!";
+	file << "Hello World!";
 	return 0;
 }