1 files changed, 15 insertions, 17 deletions

diff --git a/src/client/SaveInfo.h b/src/client/SaveInfo.h
index a54741a..6c3a2a3 100644
--- a/src/client/SaveInfo.h
+++ b/src/client/SaveInfo.h
@@ -5,10 +5,8 @@
 #include <string>
 #include <stdlib.h>
 #include <iostream>
-#include <string.h>
-#include "GameSave.h"
 
-using namespace std;
+class GameSave;
 
 class SaveInfo
 {
@@ -24,34 +22,34 @@ public:
 
 	SaveInfo(SaveInfo & save);
 
-	SaveInfo(int _id, int _date, int _votesUp, int _votesDown, string _userName, string _name);
+	SaveInfo(int _id, int _date, int _votesUp, int _votesDown, std::string _userName, std::string _name);
 
-	SaveInfo(int _id, int date_, int _votesUp, int _votesDown, int _vote, string _userName, string _name, string description_, bool published_, vector<string> tags);
+	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);
 
 	~SaveInfo();
 
-	string userName;
-	string name;
+	std::string userName;
+	std::string name;
 
-	string Description;
+	std::string Description;
 
-	vector<string> tags;
+	std::vector<std::string> tags;
 
 	int vote;
 
 	bool Published;
 
-	void SetName(string name);
-	string GetName();
+	void SetName(std::string name);
+	std::string GetName();
 
-	void SetDescription(string description);
-	string GetDescription();
+	void SetDescription(std::string description);
+	std::string GetDescription();
 
 	void SetPublished(bool published);
 	bool GetPublished();
 
-	void SetUserName(string userName);
-	string GetUserName();
+	void SetUserName(std::string userName);
+	std::string GetUserName();
 
 	void SetID(int id);
 	int GetID();
@@ -65,8 +63,8 @@ public:
 	void SetVotesDown(int votesDown);
 	int GetVotesDown();
 
-	void SetTags(vector<string> tags);
-	vector<string> GetTags();
+	void SetTags(std::vector<std::string> tags);
+	std::vector<std::string> GetTags();
 
 	GameSave * GetGameSave();
 	void SetGameSave(GameSave * gameSave);