Use forward declarations more to avoid excessive includes

1 files changed, 15 insertions, 14 deletions

diff --git a/src/client/SaveInfo.cpp b/src/client/SaveInfo.cpp
index 1df74c7..3b8b9a1 100644
--- a/src/client/SaveInfo.cpp
+++ b/src/client/SaveInfo.cpp
@@ -5,8 +5,9 @@
  *      Author: Simon
  */
 
-#include "client/SaveInfo.h"
-#include "client/Client.h"
+#include "SaveInfo.h"
+#include "GameSave.h"
+#include "Client.h"
 
 SaveInfo::SaveInfo(SaveInfo & save) :
 		userName(save.userName), name(save.name), Description(save.Description), date(
@@ -16,15 +17,15 @@ SaveInfo::SaveInfo(SaveInfo & save) :
 		gameSave = new GameSave(*save.gameSave);
 }
 
-SaveInfo::SaveInfo(int _id, int _date, int _votesUp, int _votesDown, string _userName,
-		string _name) :
+SaveInfo::SaveInfo(int _id, int _date, int _votesUp, int _votesDown, std::string _userName,
+		std::string _name) :
 		id(_id), votesUp(_votesUp), votesDown(_votesDown), userName(_userName), name(
 				_name), Description("No description provided"), date(_date), Published(
 				true), gameSave(NULL), vote(0), tags(), Comments(0) {
 }
 
-SaveInfo::SaveInfo(int _id, int date_, int _votesUp, int _votesDown, int _vote, string _userName,
-		string _name, string description_, bool published_, vector<string> tags_) :
+SaveInfo::SaveInfo(int _id, int date_, int _votesUp, int _votesDown, int _vote, std::string _userName,
+		std::string _name, std::string description_, bool published_, std::vector<std::string> tags_) :
 		id(_id), votesUp(_votesUp), votesDown(_votesDown), userName(_userName), name(
 				_name), Description(description_), date(date_), Published(
 				published_), gameSave(NULL), vote(_vote), tags(tags_), Comments(0) {
@@ -38,17 +39,17 @@ SaveInfo::~SaveInfo()
 	}
 }
 
-void SaveInfo::SetName(string name) {
+void SaveInfo::SetName(std::string name) {
 	this->name = name;
 }
-string SaveInfo::GetName() {
+std::string SaveInfo::GetName() {
 	return name;
 }
 
-void SaveInfo::SetDescription(string description) {
+void SaveInfo::SetDescription(std::string description) {
 	Description = description;
 }
-string SaveInfo::GetDescription() {
+std::string SaveInfo::GetDescription() {
 	return Description;
 }
 
@@ -69,11 +70,11 @@ int SaveInfo::GetVote()
 	return vote;
 }
 
-void SaveInfo::SetUserName(string userName) {
+void SaveInfo::SetUserName(std::string userName) {
 	this->userName = userName;
 }
 
-string SaveInfo::GetUserName() {
+std::string SaveInfo::GetUserName() {
 	return userName;
 }
 
@@ -98,11 +99,11 @@ int SaveInfo::GetVotesDown() {
 	return votesDown;
 }
 
-void SaveInfo::SetTags(vector<string> tags)
+void SaveInfo::SetTags(std::vector<std::string> tags)
 {
 	this->tags = tags;
 }
-vector<string> SaveInfo::GetTags()
+std::vector<std::string> SaveInfo::GetTags()
 {
 	return tags;
 }